Add additional cache types for Magproto.

Misc lang cleanups.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index cbccd786314ca09147c41bbe85cf3d00c8cc5269..e2c309ac000de871bb06d4dcb8f9956b95e7780f 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -228,7 +228,7 @@ void *MKSHORT_NEW_HANDLE(DEBUG_PARAMS);
 #define mkshort( a, b) MKSHORT(a,b,__FILE__, __LINE__)
 #define mkshort_new_handle() MKSHORT_NEW_HANDLE(__FILE__,__LINE__)
 #endif
-void *mkshort_del_handle(void *h);
+void mkshort_del_handle(void *h);
 void setshort_length(void *, int n);
 void setshort_badchars(void *, const char *);
 void setshort_mustupper(void *, int n);

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index b9b3af6be06b1684b5fffce9246de4b293908bb9..0d191a99f34a21b7777858914608cd0b5032d4ec 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -156,6 +156,8 @@ static icon_mapping_t map330_icon_table[] = {
        { "ah", "Virtual cache"},       /* Binos: becuase you "see" them. */
        { "ak", "Micro-Cache" },        /* Looks like a film canister. */
        { "an", "Multi-Cache"},         /* Winery: grapes 'coz they "bunch" */
+       { "s",  "Unknown Cache"},       /* 'Suprise' cache: use a target. */
+       { "ac",  "Event Cache"},        /* Event caches.  May be food. */
        { NULL, NULL } 
 };
 

diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c
index c2fae3f4d90d340f0d77296c87f15af7a3bdff11..c292bf00129f9cbb3ef5a22dba4af228aeb485bf 100644 (file)
--- a/gpsbabel/mkshort.c
+++ b/gpsbabel/mkshort.c
@@ -85,7 +85,7 @@ is_unique(mkshort_handle *h, char *name)
 }
 
 static
-int
+void
 add_to_hashlist(mkshort_handle *h, char *name)
 {
        int hash = hash_string(name);
@@ -122,7 +122,7 @@ mkshort_add_to_list(mkshort_handle *h, char *name)
        return name;
 }
 
-void *
+void
 mkshort_del_handle(void *h)
 {
        mkshort_handle *hdr = h;

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index 415b2344087c0b35109edfcfc0cb1aadcfe6334b..73852a1c5bc344b4d4889ff5175401264ee4a896 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -453,13 +453,18 @@ get_cache_icon(const waypoint *waypointp)
                case gc_micro: 
                        return "Micro-Cache";
                        break;
+               default:
+                       break;
        }
        switch (waypointp->gc_data.type) {
                case gt_virtual:
                        return "Virtual cache";
                case gt_multi:
                        return "Multi-Cache";
-                       break;
+               case gt_event:
+                       return "Event Cache";
+               case gt_suprise:
+                       return "Unknown Cache";
                default:
                        break;
        }